From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 20 Apr 2011 06:27:19 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4024^2~34
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=14dc755ef1d14297e1cc2ff19d12441d64cb5b4c;p=emacs.git

Merge from mainline.
---

14dc755ef1d14297e1cc2ff19d12441d64cb5b4c